From: Jonas Dreßler <verdre@v0yd.nl>
Date: Mon, 17 Feb 2020 13:12:47 +0000 (+0100)
Subject: appDisplay: Take the viewBox into account for the contentBox of folders
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~167
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1ec511771554a28b798fc0305a889c49292fdcbe;p=gnome-shell.git

appDisplay: Take the viewBox into account for the contentBox of folders

The viewBox has a border applied, so when we call adaptToSize using only
the content box of the container, the width of the border is not removed
from the content box and the grid will be allocated less space than what
we told it before using adaptToSize.

Fix that by adjusting the content box for the size of the viewBox, too.
This makes sure the correct amount of columns can be shown inside a
folder, since right now we only show 3 colums even though 4 would fit.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1011
---

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index a602ba65d..f5e18d2ad 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1902,6 +1902,7 @@ var AppFolderDialog = GObject.registerClass({
 
     vfunc_allocate(box, flags) {
         let contentBox = this.get_theme_node().get_content_box(box);
+        contentBox = this._viewBox.get_theme_node().get_content_box(contentBox);
 
         let [, entryBoxHeight] = this._entryBox.get_size();
         let spacing = this._viewBox.layout_manager.spacing;